From: Juri Linkov Date: Sun, 11 Mar 2012 10:27:53 +0000 (+0200) Subject: * lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~482 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0859ca4f28f67f8f6f651c34bf5751f6a21e74a2;p=emacs.git * lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b7066b66729..4f2849a003f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-03-11 Juri Linkov + + * replace.el (replace-highlight): Set isearch-word to nil + unconditionally. (Bug#10887) + 2012-03-10 Eli Zaretskii * net/mairix.el (mairix-replace-invalid-chars): Rename from diff --git a/lisp/replace.el b/lisp/replace.el index 349e63d4201..9fbaa279079 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2116,13 +2116,13 @@ make, or the user didn't cancel the call." (if query-replace-lazy-highlight (let ((isearch-string string) (isearch-regexp regexp) + ;; Set isearch-word to nil because word-replace is regexp-based, + ;; so `isearch-search-fun' should not use `word-search-forward'. + (isearch-word nil) (search-whitespace-regexp nil) (isearch-case-fold-search case-fold) (isearch-forward t) (isearch-error nil)) - ;; Set isearch-word to nil because word-replace is regexp-based, - ;; so `isearch-search-fun' should not use `word-search-forward'. - (if (and isearch-word isearch-regexp) (setq isearch-word nil)) (isearch-lazy-highlight-new-loop range-beg range-end)))) (defun replace-dehighlight ()